screenShield: Always show session's unlock dialog

Instead of destroying the dialog when the screen shield is
visible, and creating it when lifting the shield, always show
the session's unlock dialog.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 6a2e37e1b6e68cdd1551d14de35e193e7cd4ad8d..918df054360ef58e661a472ab10d6d7a81a93939 100644 (file)
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -564,11 +564,6 @@ var ScreenShield = class {
     }
 
     _lockScreenShown(params) {
-        if (this._dialog && !this._isGreeter) {
-            this._dialog.destroy();
-            this._dialog = null;
-        }
-
         let motionId = global.stage.connect('captured-event', (stage, event) => {
             if (event.type() == Clutter.EventType.MOTION) {
                 this._cursorTracker.set_pointer_visible(true);
@@ -696,6 +691,8 @@ var ScreenShield = class {
         if (this._activationTime == 0)
             this._activationTime = GLib.get_monotonic_time();
 
+        this._ensureUnlockDialog(true);
+
         this.actor.show();
 
         if (Main.sessionMode.currentMode != 'unlock-dialog' &&